assistant: Drop unnecessary frame

We can just style the sidebar box itself, no need for an
extra frame widget.

diff --git a/gtk/gtkassistant.c b/gtk/gtkassistant.c
index 2945d534ee96a936fe60e89e24760b1d923b9ca9..4ef85bc260e3aa5a4d5b7c780c1cbed9205a82b5 100644 (file)
--- a/gtk/gtkassistant.c
+++ b/gtk/gtkassistant.c
@@ -110,7 +110,6 @@ struct _GtkAssistantPrivate
   GtkWidget *last;
 
   GtkWidget *sidebar;
-  GtkWidget *sidebar_frame;
   GtkWidget *content;
   GtkWidget *action_area;
   GtkWidget *headerbar;
@@ -663,7 +662,6 @@ gtk_assistant_class_init (GtkAssistantClass *class)
   gtk_widget_class_bind_template_child_private (widget_class, GtkAssistant, close);
   gtk_widget_class_bind_template_child_private (widget_class, GtkAssistant, last);
   gtk_widget_class_bind_template_child_private (widget_class, GtkAssistant, sidebar);
-  gtk_widget_class_bind_template_child_private (widget_class, GtkAssistant, sidebar_frame);
   gtk_widget_class_bind_template_child_private (widget_class, GtkAssistant, button_size_group);
   gtk_widget_class_bind_template_child_private (widget_class, GtkAssistant, title_size_group);
 
@@ -972,7 +970,7 @@ update_title_state (GtkAssistant *assistant)
         show_titles = TRUE;
     }
 
-  gtk_widget_set_visible (priv->sidebar_frame, show_titles);
+  gtk_widget_set_visible (priv->sidebar, show_titles);
 }
 
 static void

diff --git a/gtk/ui/gtkassistant.ui b/gtk/ui/gtkassistant.ui
index a77d3fdf57e466df651a94ab98ce5f23593968b2..e516c910c94d06500fbce459620d018dabd0dba5 100644 (file)
--- a/gtk/ui/gtkassistant.ui
+++ b/gtk/ui/gtkassistant.ui
@@ -11,19 +11,12 @@
       <object class="GtkBox" id="main_box">
         <property name="visible">1</property>
         <child>
-          <object class="GtkFrame" id="sidebar_frame">
+          <object class="GtkBox" id="sidebar">
             <property name="visible">1</property>
+            <property name="orientation">vertical</property>
             <style>
               <class name="sidebar"/>
             </style>
-            <child>
-              <object class="GtkBox" id="sidebar">
-                <property name="visible">1</property>
-                <property name="orientation">vertical</property>
-                <property name="spacing">6</property>
-              </object>
-            </child>
-            <child type="label_item"/>
           </object>
           <packing>
             <property name="fill">0</property>